From 6e94be3f500739f1fc1f3beb534ab3b3a91fdb11 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 17 Nov 2017 00:02:01 -0500
Subject: [PATCH] Drop the error trap vfuncs

No longer used.
---
 gdk/gdkdisplayprivate.h          |  3 ---
 gdk/wayland/gdkdisplay-wayland.c | 14 --------------
 gdk/win32/gdkdisplay-win32.c     | 15 ---------------
 gdk/x11/gdkdisplay-x11.c         | 17 -----------------
 4 files changed, 49 deletions(-)

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 96f2814041..f2927ab6d0 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -164,9 +164,6 @@ struct _GdkDisplayClass
                                                     GdkWindowAttr *attributes);
 
   GdkKeymap *                (*get_keymap)         (GdkDisplay    *display);
-  void                       (*push_error_trap)    (GdkDisplay    *display);
-  gint                       (*pop_error_trap)     (GdkDisplay    *display,
-                                                    gboolean       ignore);
 
   GdkWindow *                (*get_selection_owner) (GdkDisplay   *display,
                                                      GdkAtom       selection);
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index d8dc8cb305..c6063ea3f1 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -937,18 +937,6 @@ _gdk_wayland_display_get_keymap (GdkDisplay *display)
   return tmp_keymap;
 }
 
-static void
-gdk_wayland_display_push_error_trap (GdkDisplay *display)
-{
-}
-
-static gint
-gdk_wayland_display_pop_error_trap (GdkDisplay *display,
-				    gboolean    ignored)
-{
-  return 0;
-}
-
 static int
 gdk_wayland_display_get_n_monitors (GdkDisplay *display)
 {
@@ -1037,8 +1025,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
   display_class->notify_startup_complete = gdk_wayland_display_notify_startup_complete;
   display_class->create_window_impl = _gdk_wayland_display_create_window_impl;
   display_class->get_keymap = _gdk_wayland_display_get_keymap;
-  display_class->push_error_trap = gdk_wayland_display_push_error_trap;
-  display_class->pop_error_trap = gdk_wayland_display_pop_error_trap;
   display_class->get_selection_owner = _gdk_wayland_display_get_selection_owner;
   display_class->set_selection_owner = _gdk_wayland_display_set_selection_owner;
   display_class->send_selection_notify = _gdk_wayland_display_send_selection_notify;
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index bdcfa667ba..e23fd25bb3 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1086,19 +1086,6 @@ gdk_win32_display_notify_startup_complete (GdkDisplay  *display,
   /* nothing */
 }
 
-static void
-gdk_win32_display_push_error_trap (GdkDisplay *display)
-{
-  /* nothing */
-}
-
-static gint
-gdk_win32_display_pop_error_trap (GdkDisplay *display,
-				  gboolean    ignored)
-{
-  return 0;
-}
-
 static int
 gdk_win32_display_get_n_monitors (GdkDisplay *display)
 {
@@ -1262,8 +1249,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->create_window_impl = _gdk_win32_display_create_window_impl;
 
   display_class->get_keymap = _gdk_win32_display_get_keymap;
-  display_class->push_error_trap = gdk_win32_display_push_error_trap;
-  display_class->pop_error_trap = gdk_win32_display_pop_error_trap;
   display_class->get_selection_owner = _gdk_win32_display_get_selection_owner;
   display_class->set_selection_owner = _gdk_win32_display_set_selection_owner;
   display_class->send_selection_notify = _gdk_win32_display_send_selection_notify;
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index cdca966220..d35e508920 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -3051,21 +3051,6 @@ gdk_x11_display_get_screen (GdkDisplay *display)
   return GDK_X11_DISPLAY (display)->screen;
 }
 
-static gint
-pop_error_trap (GdkDisplay *display,
-                gboolean    ignored)
-{
-  if (ignored)
-    {
-      gdk_x11_display_error_trap_pop_ignored (display);
-      return Success;
-    }
-  else
-    {
-      return gdk_x11_display_error_trap_pop (display);
-    }
-}
-
 static GdkKeymap *
 gdk_x11_display_get_keymap (GdkDisplay *display)
 {
@@ -3218,8 +3203,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->notify_startup_complete = gdk_x11_display_notify_startup_complete;
   display_class->create_window_impl = _gdk_x11_display_create_window_impl;
   display_class->get_keymap = gdk_x11_display_get_keymap;
-  display_class->push_error_trap = gdk_x11_display_error_trap_push;
-  display_class->pop_error_trap = pop_error_trap;
   display_class->get_selection_owner = _gdk_x11_display_get_selection_owner;
   display_class->set_selection_owner = _gdk_x11_display_set_selection_owner;
   display_class->send_selection_notify = _gdk_x11_display_send_selection_notify;
-- 
2.30.2